Made everything nice
made code better in general
Getting close to the finish