Add more changes and clean up some code..