[UPDATE] Condensing code & reducing spaces