Refactored the source for being beautiful ~8>