Second commit - Code cleaned.