Cleaned up abit code.