Quick code cleanup
Code cleanup