[TASK] Updated to fit Codingstandard