Refactored!

Cleaned moar stuff and things!