Code formatting & code style issues