dev: follow style conventions more