Removed unwanted comments and stuff