Refactor

Fix all the issues! #1 (closed) #2 #3 (closed) #4 (closed) #5 #6 (closed) and #7 (closed)