Code cleanup and redundancy removed for files inclusion