Update Source Code

Just made it a little bit cleaner