removed unused method
removed unused method
usage of Optional for study. And code format
Code formatting