cleaning up for better code, cosmetic

Most of jynik points have been addressed