Code cleanup

Cleaned up every area... Keep it clean and nice.