Fixed formatting, method naming