Cleaned up files and checked indentation