code formatting and adopted uniformity in code