Fixed comments and moved a method