[#84] Make code clean. A bit cleaner.