cleaned up abit
cleaned up abit