Cleaning up code sections
Fixed #3, in a terrible way.