Formatting, removing deprecated methods