Code formated, unused empty method removed