Minor optimization
Code cleanup