Removed redundant code, replaced with source file reference. Minor code cleaning.