code cleaned, removed trash stuff