Organized a bit better