Removed comments and what not