Code prettyfication and simplification. Removed first unused method.