Update: applied naming conventions and added more