Organized and removed unnecessary using statements.