removed comments and line spacing