Fix formatting, simplify methods