little bit of optimization and cleanup