Fixed comments/removed unnecessary methods