Removed ugly formating