clean up code
clean up code
Fix null pointer exception
move around