Fixed indentation, cleaned up using statements, and removed some obsolete code that was commented out.