Mainly debugging and some shortening