Code is now cleaned up.
Final commit. Project completed.