Removed comments and added dependencies