Removed unnecessary code and small content chagnes