Also removed comments and replaced variable names