removed unrequired proxy duplicate code
whitespace fixes