Minor Changes

Only changed the line location of some methods