Removed some un-needed imports, Updated the main file to match current code format.