Refactored, fixed whitespace issue
Moar files and text