Cleaned the files up

Please merge!