Deprecated method
Style cleanup