Minor changes - indentation and method names