Cleaned code, thanks insight