Refactored SuperActivity and fixed indentation