Cleaned up more codes
Cleaned up more codes