Removed unnecessary argument to IS_FILE_P and IS_DIR_P
Messing with macros
Removing duplicate code