Splitted into two files
Small fixes