Remove unneeded classes. Update method indention