Fixed formatting and removed old file