Modification to bundle and compile info files + code cleanup