Fixed Styling
Updated tests, removed old code.