Small cosmeting changes and added main.cpp in world