improving readability,
removing redundant code