#29 Code cleaning