Edited comments and removed test code