Some more codestylin'