Minor adjustments

Added minor adjustments in code readability, comments, structure.