Temporary
MVC is almost up
Preparation for code clean up
Cleaned up more codes
Cleaned up more codes