made code more readable
bump version to reflect changes
optimize core components