added cleanup commands
cleanup modifications and beautifications