Cleaned up abit more