diff --git a/src/App.js b/src/App.js
index 7996303501..1b1e9e3001 100644
--- a/src/App.js
+++ b/src/App.js
@@ -12,7 +12,9 @@ class BooksApp extends React.Component {
   }
 
   updateBooks = () => {
-    BooksAPI.getAll().then(books => this.setState({ books }))
+    BooksAPI
+      .getAll()
+      .then(books => this.setState({ books }))
   }
 
   moveBook = (book, shelf) => {
@@ -60,38 +62,36 @@ class BooksApp extends React.Component {
   }
 
   componentDidMount() {
-    this.updateBooks();
+    this.updateBooks()
   }
 
-  render() {
-    return (
-      <div className="app">
-        <Route
-          exact path="/"
-          render={() => (
-            <BooksList
-              books={ this.state.books }
-              title={ "MyReads by @helioricardo" }
-              onMoveBook={ this.moveBook }
-            />
-          )}
-        />
-        <Route
-          path="/search"
-          render={({ history }) => (
-            <BooksSearch
-              searchResults={ this.state.searchResults }
-              onSearchBooks={ this.searchBooks }
-              onMoveBook={(book, shelf) => {
-                this.moveBook(book, shelf)
-                history.push('/')
-              }}
-            />
-          )}
-        />
-      </div>
-    )
-  }
+  render = () => (
+    <div className="app">
+      <Route
+        exact path="/"
+        render={() => (
+          <BooksList
+            books={ this.state.books }
+            title={ "MyReads by @helioricardo" }
+            onMoveBook={ this.moveBook }
+          />
+        )}
+      />
+      <Route
+        path="/search"
+        render={({ history }) => (
+          <BooksSearch
+            searchResults={ this.state.searchResults }
+            onSearchBooks={ this.searchBooks }
+            onMoveBook={(book, shelf) => {
+              this.moveBook(book, shelf)
+              history.push('/')
+            }}
+          />
+        )}
+      />
+    </div>
+  )
 }
 
 export default BooksApp
diff --git a/src/Book.js b/src/Book.js
index 255837bb38..70ab321cca 100644
--- a/src/Book.js
+++ b/src/Book.js
@@ -2,32 +2,30 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import shelves from './Shelves'
 
-const Book = props => {
-  return (
-    <div className={(props.shelf !== "none") ? "book book-on-shelf" : "book"}>
-      <div className="book-top">
-        <div className="book-cover" style={{ width: 128, height: 193, backgroundImage: `url(${props.image})` }}></div>
-            <div className="book-shelf-changer">
-              <select
-                value={ props.shelf }
-                onChange={ (event) => props.onMoveBook(event.target.value) }>
-                <option value="none" disabled>Move to...</option>
-                {
-                  shelves.map((shelf) => (
-                    <option key={shelf.key} value={ shelf.key }>{ shelf.title }</option>
-                  ))
-                }
-                { !props.onSearchPage &&
-                  <option value="none">None</option>
-                }
-              </select>
-            </div>
-        </div>
-      <div className="book-title">{ props.title }</div>
-      <div className="book-authors">{ props.authors }</div>
-    </div>
-  )
-}
+const Book = props => (
+  <div className={(props.shelf !== "none") ? "book book-on-shelf" : "book"}>
+    <div className="book-top">
+      <div className="book-cover" style={{ width: 128, height: 193, backgroundImage: `url(${props.image})` }}></div>
+          <div className="book-shelf-changer">
+            <select
+              value={ props.shelf }
+              onChange={ (event) => props.onMoveBook(event.target.value) }>
+              <option value="none" disabled>Move to...</option>
+              {
+                shelves.map((shelf) => (
+                  <option key={shelf.key} value={ shelf.key }>{ shelf.title }</option>
+                ))
+              }
+              { !props.onSearchPage &&
+                <option value="none">None</option>
+              }
+            </select>
+          </div>
+      </div>
+    <div className="book-title">{ props.title }</div>
+    <div className="book-authors">{ props.authors }</div>
+  </div>
+)
 
 Book.propTypes = {
   image: PropTypes.string.isRequired,
diff --git a/src/BooksList.js b/src/BooksList.js
index c0c6422fb9..f4d514630b 100644
--- a/src/BooksList.js
+++ b/src/BooksList.js
@@ -4,34 +4,32 @@ import Link from 'react-router-dom/Link'
 import Shelf from './Shelf'
 import shelves from './Shelves'
 
-const BooksList = ({ books, title, onMoveBook }) => {
-  return (
-    <div className="list-books">
-      <div className="list-books-title">
-        <h1>{ title }</h1>
-      </div>
-      <div className="list-books-content">
-        <div>
-          {
-            shelves.map(shelf => (
-              <Shelf
-                key={ shelf.key }
-                shelf={ shelf }
-                onMoveBook={ onMoveBook }
-                books={
-                  books.filter(book => book.shelf === shelf.key)
-                }
-              />
-            ))
-          }
-        </div>
-      </div>
-      <div className="open-search">
-        <Link to="/search">Add a book</Link>
+const BooksList = ({ books, title, onMoveBook }) => (
+  <div className="list-books">
+    <div className="list-books-title">
+      <h1>{ title }</h1>
+    </div>
+    <div className="list-books-content">
+      <div>
+        {
+          shelves.map(shelf => (
+            <Shelf
+              key={ shelf.key }
+              shelf={ shelf }
+              onMoveBook={ onMoveBook }
+              books={
+                books.filter(book => book.shelf === shelf.key)
+              }
+            />
+          ))
+        }
       </div>
     </div>
-  )
-}
+    <div className="open-search">
+      <Link to="/search">Add a book</Link>
+    </div>
+  </div>
+)
 
 BooksList.propTypes = {
   books: PropTypes.array.isRequired,
diff --git a/src/Shelf.js b/src/Shelf.js
index 437119640b..10dbc13d0a 100644
--- a/src/Shelf.js
+++ b/src/Shelf.js
@@ -2,30 +2,28 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import Book from './Book'
 
-const Shelf = ({ shelf, books, onMoveBook }) => {
-  return (
-    <div className="bookshelf">
-      <h2 className="bookshelf-title">{ shelf.title }</h2>
-      <div className="bookshelf-books">
-        <ol className="books-grid">
-          {
-            books.map((book) => (
-              <li key={ book.id }>
-                <Book
-                  shelf={ book.shelf }
-                  image={ book.imageLinks.thumbnail }
-                  title={ book.title }
-                  authors={ (Array.isArray(book.authors)) ? book.authors.join(", ") : null }
-                  onMoveBook={shelf => onMoveBook(book, shelf) }
-                />
-              </li>
-            ))
-          }
-        </ol>
-      </div>
+const Shelf = ({ shelf, books, onMoveBook }) => (
+  <div className="bookshelf">
+    <h2 className="bookshelf-title">{ shelf.title }</h2>
+    <div className="bookshelf-books">
+      <ol className="books-grid">
+        {
+          books.map((book) => (
+            <li key={ book.id }>
+              <Book
+                shelf={ book.shelf }
+                image={ book.imageLinks.thumbnail }
+                title={ book.title }
+                authors={ (Array.isArray(book.authors)) ? book.authors.join(", ") : null }
+                onMoveBook={shelf => onMoveBook(book, shelf) }
+              />
+            </li>
+          ))
+        }
+      </ol>
     </div>
-  )
-}
+  </div>
+)
 
 Shelf.propTypes = {
   shelf: PropTypes.object.isRequired,