tidied up layers