Final v1.1

Final: Cleaned-up code