Fix: Style, comments, and tests