clean up a little and two init methods were added