simplified to one liner
fixed ugliness