cleaned up abit