Organized Better

Made the code even easier too be read.