TheJaydox cleaning/reducing

Cleaned up code, all activities related to #2, basic test performed, merging back to master.