Cleared junk and fixed padding