Codestyle and improvements.