Overall neater looks + better file storage mechanism