quick code clean up
updated Changes