Fixed and cleaned up files