Improved readability, removed local .lck fil