Cleaned up abit