Cleaned up connection proccess