Few code optimizations

Signed-off-by: Fadion Dashi <jonidashi@gmail.com>
v1.2.3: Merged from Fadion Dashi
And added Faddion to the list of authors too.

Signed-off-by: Baki Goxhaj <banago@gmail.com>