Organized a bit more