Compu's changes + code reformatting

new features + cleaner code.