aestatical code cleanups