header + general cleanup