Code conventions, cleanup