Re-indented code for consistency