Removed old commented out implementation
Style fix
Style fix