Added more members to Parts class, clean up code further and added comments