updated naming conventions // cleanup