Cleaned up to fulfil the coding-conventions