Some clean in code