cleanup
implementing uc var convention