Removed duplicate logic from loops
Release 0.5.0