Prettification and improvements