Removed magic number
Added `basename`